Minor things
Fixed conflict