fixed conflict on ignore flie