fix second conflict