merge  and resolve conflicts