Import source code
Fixing merge conflicts
merge conflict fixed