Oops. Resolved conflicts code.