Added emblemjs integration
Fix merge conflict