Merging the project local and on github