Some changes lost in merges