add loading screen
merge conflics