recommit tips.html because of merge fail from wojtek