Fix merge bug