Undid merge