testing to see if it is making me commit to my local branch in order to not have conflict
Merge origin/master