Converted to run in passes, such that we write to the same picture the different circles
Resolved conflicts in mergetool