Adding Polymer dialog
Fix merge conflicts