fixing merge bug?