Removed Merge conflicts in text.
Pushing new resize file.