delete them for solve conflic