committing and pushing in order to merge with Chris' branch and correct
conflicts