Committing because Andrew yelled at me.
fixed merge conflicts