Added some untracked files

Trying to resolve merge conflicts