bug fixes
merging conflicts
grunt build