tweaks
Fixing merge conflict
fixed garbage