[MERGE] fix but weird behavior of git here, Nobody did push anything, I was...

[MERGE] fix but weird behavior of git here, Nobody did push anything, I was last one commit and I have to fix the merge when pulling back