damn Git, the auto merge is not so good