Employee table complete
Conflict solved
Login Working