fixing second conflict