Removed unused html file
Fixed conflict