Update add stuff in conflict resting