got sign in bar working
fixed merge