Fixed weird library html merge conflict