fixed front page firefox issue
fixed merge issues'