Merge Fix code

Merge Code