Resolving Merge Conflicts

.