Fixing Conflicts, adding missing files.