Added logged out message
Fixed conflict