added conflicting file back
Merge pull request #1 from oostenveld/bug1967-mergeconflict

added conflicting file back