FIx merge issue