fixed embedly problem
clean
small non-logic merge conflict in pin.html