UNSTABLE: merge conflicts fix.