Adjusted for checkout conflict
Merge origin/master
Adjusted for checkout conflict then merge conflict