Merge

While there are different ways and tools to handle the issue, in this post we will use a Microsoft standard