adding missing files
resolve merge conflicts