Merge your fork with the main project

You can start working on the main project now, I made you a collaborator and you should have the same access as me.