Undo merge with the master branch