add gem, fix html code
Update the changes
fix conflict