finishing up deletions for paths
fixing merge conflicts