rebuild after git problem
git merge