Fixes + merge conflicts resolution
minify