Fixed bug with conflic