Adopted main to accept new merging code