Working sensibly in conflict and migration settings

Working sensibly in conflict and migration settings