all merge bugs are out now, normally :p