Resolved conflicts with standard version.