merge conflicts script & npm module cleaning