4finance interview question

How do I solve conflicts in git? Why do I like testing?