conflict1
small changes