merge bug fix.