No Merge Conflicts?, Yes!
like us!