Fixed a merge marker that was hanging around and an erroneous ro change