Sometimes, git default merge strategy is really dumb. Or it may be me.
Attach a file by drag & drop or click to upload
