merges the existing and modified
resolve merge conflicts
modified integrals file