fixed conflict
changed up testing stuff