test-project Writing different text here in feature1 branch to create a merge conflict. Again. Writing text here to create a merge conflict.