Initial commit to remote feature branch
Remote commit in master
Resolved merge conflict