intermediate commit
merge conflicts resolved?
detail screen filled out