fix wrong merge sequence and bump version