-conflict file added in order to test conflicts in git