Hi,
Merging is a price that is paid for the possibility to use non-blocking source code control systems. Merging never guarantees to be correct and/or conflict-less. Merging is a generic problem for any non-blocking source control system.
So your best approach is to work out a process to minimize the chance to have source code conflict, commit often (even non-completed code may and must be committed with the condition that it will not be used in production until been completed) and notify colleagues after every commit to let them pull committed changes and thus minimize the chance of conflict.