adding files
correct merge conflicts