getting rid of a unnecessary if statement
test system hiding merge
forgot to add the actual button