Uncommented prior to pull
Fixed conflict