Undoing merge overwrite of alias 'haha'