git ignore changed
fixed conflict