resolved mini merge problems