Conflict fixed for pull request #1135