Modified dump DP
Merge conflict resolved in dump