Resolved conflicts #2