Fixed rohan's merge fail