cleaning up merge;