Set proper target folder
Resolve merge conflicts