builds into a war
merge in local commits