resolved merge conflicts
created git ignore