just commiting somethigns
resolves merge conflicts?
works in production all tests passing