Fixed merge conflicts in dustPropagator.cpp and cleaned up code.