Empty master branch.
Resolved conflicts.