Fixed Merge conflict