Robust preprocessing
merge conflicts resolved