Code Fixes
fixed conflicts