resolve conflicts due to merging