Work on pipeline more
Remove conflicts