combo broken
added merge