After merge changes