removed leftovers from merge conflict