clean up after crazy merge