Readded stuff merge lost