Fixed Merge Conflicts