early stage2
early stage2 resolve conflict