GIT : testB
GIT : fixed conflict on db/story_test.xml