manually making the changes from the suggested merge on issue #2
manually making the changes from the suggested merge on issue #2

francescoagati/promhx,massiveinteractive/promhx,Blank101/promhx,massivision-mdk/promhx