Fixed Merge conflict 2