resolve conflicts before merging