Merge fixes merge commit hasn't picked