Choose CWA on merge conflict