Changed conflicts file

Changed conflicts file