Take into account that location of stories changed. There were too many of them in a single directory so I had to reorganize them. That might be the cause of the merge conflict. Pull the latest code from the master repo.