Import source code
Resolve merge conflict