merge conclicts fix
home link styled