Fixed the merge conflicts that were committed.