Add sugar
Fixed conflict