Merge in the maindir to the master