Resolved conflicts

Resolved conflicts:  c2cc1b56bcb5748798f13a23a03be90053d990fb