clean up merge conflict