Fixed lost changes for roles...

...this is why I told you guys to use branches...