Fixed merge error
Removed merge error
adding ignore file