Error due to merge fixed