Merge with conflict

$ git branch featurey
$ git co featurey
# edit the file , add a line, commit the change

$ git co master
# edit the file, add a line, commit the change

$ git merge featurey
CONFLICT (content): Merge conflict in
Automatic merge failed; fix conflicts and then commit the result.

use 5.010;
say "config";
# some change
# adding featurx step 1
<<<<<<< HEAD
# add fix on master
# featurey 1
>>>>>>> featurey

Edit the file and resolved the conflict, removing the marks and writing the correct code.

$ git add
$ git ci -m "featurey merged"