Commited conflict.txt to test
Test change of conflict file