Merge commit problems fixed.