Deploy to another dir
Merge conflict solved