added run button
added run button and fixed conflicts