Adding all new files
fixed merge conflicts