merge conflict on registercontroller fixed