Putting back line lost in merge conflict