Merge all edits into your repository

I think this is how its supposed to work? IDK :/