using copy directory to revert changes
fixed merge conflict