merge conflicts resolved
initial dump sorting