Adding no-conflict and removing unnecessary files from that directory