remove stale merge conflict