new setup, old one in my PC got busted
Fixed conflicts