added my name
resolve conflicts
Fix Changes
fixed conflicts