Merge. Now valid code.