Merge
Fixed Merge conflicts