u did not resolve conficts in a right way