Changes merge