Fixed bug during merge