nush ce
resolve conflict