Resolved merge conflicts while merging from master