Front HomePage Login
Fix Conflicts