...
fixed merge conflict
removed garbage files