Cleanup merge stuff