some leftovers from the merge