removed deleted files
fixed merge conflicts