Manually resolved conflict and merged in pull request.