fixed git errors in controller and scanner