manual correction of confliction from auto-merge