cleaned up merge.