removing ignore file conflicts