Fix paths.
Fix merge conflicts.