maybe we can directly click accept all button when we want to keep both changes, which is much easier than manully change.