# 1 > Setup

This scenerio assumes you have 2 directories and want to merge these together. -> We will assume directoryA and directoryB You will be using PHP Storm for this

# 2 > Compare

Right click on the root of the project
-> Then choose 'Compare'

# 3 > Choose DirectoryA

Use Finder to find DirectoryA
-> Ensure you compare both the same ROOTs as DirectoryA and DirectoryB

# 4 > Resolve

Use the editor to resolve the conflicts