changes after filesystem merge