Merge test

Since the mergetool kept the variables in the subroutines, I removed them from the beginning. There was also a bug in yours where there were two main() subroutines, so I fixed that as well, since that was going to do nothing.