merging same changes
Done
done
fixed bug