Resolve conflicts
Add white loader of greater resolution