cleanup merge conflicts