new changes
conflicts solving
building