fixed things that magically went wrong
fixed conflict with ignore