merge accepted