resolving conflicts when pushing
modified integrals file