Possibly fixed merge issues

Just missing an end bracket. Runs smoothly now.