better conflict resolution for auto/manual position