merge and resolve conflict