I had the repo cloned before the force push and when I went to pull it, this file was the only one that contained a conflict.
I had the repo cloned before the force push and when I went to pull it, this file was the only one that contained a conflict.