Forking from the idapp branchs and merge them in one single one