Cleanup merge
Fix merge issues