rel_1 bug fixed
Merging is conflict is resolved