fixed some conflicts with repo on my desktop