Merge conflict

Edited out some conflicts that were occuring.