Fix conflit in pumgrana_api