finished merging with head