Add back file changes lost in merge.