update cause of merge conflict