Learning-Branch-Merge Tried merging different branches Also merging master into feature And resolving conflicts using mergetool