Merget and resolve conflicts