Adding initial files
Fixing conflicts