Made changes that'll conflict...I hope
Resolved merge conflict from pull request