No longer generating source maps
manual merge
manual merge