Your Name
Resolved merge conflicts by keeping upstream version
3e4d895