committing again, merging all day long