After merge here come the changes