Style change
Fixed conflict