Removed the folder conflicts