Fixed some roadblock problems
Fix Conflicts
Forced commit