Add fun and index
Edit index
Merge with origin