wrote to recursively check for conflicts, resolve manually