remove conflict junk, fix paths
remove error log