Cookie
Loader solved
conflicts resolved