- fixed conflict
- ignor
- ignore file