Import source code
Fixing conflicts