Resolved merge conflict, keep local README
