modified things
Resolved Merge Issues