pivotal bugs cleared
merge conflict resolved