manual correction of auto-merge confliction