Kicked up version and overwrote bad merge/commit