added title
resolve conficts