Merge error

When i sync my project the Logged user and session manager that stan put
was delete but i added the same new class and Copy Pastes the codes in
the github to the new class ..... i really though i screwed stan work
sorry stan