just  4 updating
conflicts solved