Fixed  merge issue