Recommitted all of the changes that I had done previously in my branch that ended up not merging correctly.