Add confilct