updating process circles
merge conflict