change second story
resolve conflict