Necessary for pull
Resolved merge conflict