marta commit
conflicts solved