Possible fix for "CONFLICT @"