merge and navbar fix