init
resolve conflic