tweaked test 5
deleted weird files
fix merge conflicts
change conflicts