conflicts
fix conflicts
conflicts
precompile
taking out imgs