The merge is not so difficult that it's worth agonising over it. Just do it - if it's removed later then fine.
The merge is not so difficult that it's worth agonising over it. Just do it - if it's removed later then fine.