manually merge line for conflict
Merge pull request #2 from symbolist/zub/story/test2-mergesomedataforconflicts

manually merge line for conflict