remove the conflicted files that haven't been touched in 6 months
add a script to import these scripts into cascade