clean up merge stuff