got the merge wrong