publish script
merge conflict resolution
remove files
remove redundant bower.json file - lives in build branch