merged neon lib into main lib