actually resolving the conflicts now