Attempt on syncing the project 0

Try on merging the project.