Hopefully the new ignore file helps with merge errors