clean up messy merge