databrowser, sns.eclipse features: Fix merge errors

Last sync with 'master' left <<HEAD === >> merge error markers that
prevents products from starting