re-merge logout views