path issues
merging diffs
Diff from htlm