I think you can revert this file and then get the latest from origin, since it is already fixed.