communication fixes
conflicts fixed
communication logic discussion