work on node cluster placement
resolved conflicts