logout works now. User is remembered for one week by default
merge errors