Merged ingnore file
Fixed merge conflict