Retrieving code lost in merge