Applies fixes lost in a merge action