cleanup merge difficulties