Resolved folder conflict