Merge remote branch 'origin/master'
Resolved merge conflict