Final Fixes (Hopefully)
Conflict Fix