Remove old merge conflict