Fix messed up diffs and remove call to path.resolve