If conflicts with another developer's code are found when creating a merge request, what will you do and how to minimize such conflicts in the future?