 		ClsiManager.sendRequestOnce project_id, user_id, _.clone(options), (error, status, result...) ->
 			return callback(error) if error?
 			if status is 'conflict'
-				options.state = "conflict" # will force full compile
+				options.syncType = "full" #  force full compile
 				ClsiManager.sendRequestOnce project_id, user_id, options, callback # try again
 			else
 				callback(error, status, result...)

					imageName: project.imageName
					draft: !!options.draft
					check: options.check
					incremental: options.incremental
					state: options.state
				rootResourcePath: rootResourcePath
				resources: resources
		}

							if error?
								logger.err err:error, project_id:project_id, "error storing state in redis"
								#return callback(error)
							options.syncType = "full"
							options.syncState = projectState
							ClsiManager._finaliseRequest project_id, options, project, docs, files, callback

	_getContentFromDocUpdater: (project_id, callback = (error, docs) ->) ->
