clean up merge conflicts