almost final
fixed merge conflict
fixed merge conflicts