catch ipns branch up to master and make all things compile