Uncommented dependency injection in registration controller
Fixed conflicts