Conflicts resolved
conflicts resolved
preload images