small changes
fixed me merge conflict
fixed merge conflicts
merged