fixed a conflict that happened after my pull request was submitted and latest trunk revision happened