fixing merge bug