fixed path in remove
removed merge conflicts
used full paths
merge conflicts