init
conflit res
removed auto generated tests