clean up merge;