Added ignore file
Resolved merge on gitignore