Resolved conflicts

Resolved conflicts caused by my latest merging. Everything should be
good to go now.