Fixed conflicts but errors scrap branch