Html changes
resolve conflict