Managing merge conflicts during target updates

Edited by Oleksandr Pysaryuk