merge button
merge features
added merge functionallity
text field autograder fix
controller fix autograder