Fix leftovers from merge conflict