Commiting change to combos output format
Fixing merge hell