Fixed merge conflict & added no-login-required to gallery