Merge and js html editor mess