version up with merge fail fix