fixed edit problem with resolve in controller