Added first version of marking type 0 and 1 conflicts. Fixed a bug where multiple nodes could get the same barycenter coordinate assigned.