git merge from gwt branch