Initialized repo
Resolved merge conflict