rebuild the whole project
after merge