Testing Resolution + implementing moveOnConflict method
pruned doMoveOnConflict; added diag inital placement