my workmate don't know how to merge