move spaceAround to be below conflictResolution and have it only show up if conflictResolution is true