Deleting this folder now that merge went fine.