Changes after merge