* fixing merge bug