Final Fixes
Removed merge conflict