Added a test commit
Fixed merge
Resolved merge conflict