embedded tags work
fixing the conflicts
fixing stuff