conflict edit - v. 3.4 - refresh is back