Reset head to my best version
Resolved errors with merge