synchronize merge_utils
remove flora