Added start button
Fixed conflict