Fixed conflict and made slight rendering change