post merge bug fix