New release
Conflicts resolved.