Fixed problem with concurrent execution.
Fixed conflicts.