Revert "fixed some conflicts with repo on my desktop"

This reverts commit 63ccf73cd45b1ee2de8357c840cc28aece162b5a.