fixing after merge

fixing errors resulting from merging with master