Fixed Merge conflicts