finished order view
merge conflicts