resume uncompleted transaction email and revisions for status page
fixed conflict