FINALLY FIXED STUPID SOY
resolve conflict
delete redundancy