Resolved merge conflicts
3 files changed