merge conflict

fixing conflict for pull request #23