Cleaned up merge defaults, implemented mean-shift