Test after merge