Changed the order of the merge so that it works.