update remove iframe tag
update resolve conflict