Adding initial version
Fixing conflicts