added to git ignore
resolved merge conflict