Updating recent changes to the UI...
Resolving merge conflicts after a hard reset to the last commit