try pulling in the new commits. You shouldn’t modify this file anyway, I’m not sure why it think you modified it