flock work
messy merging
merge time