Accidentally checked in conflicting files, fixed