added files
fixed merge conflicts