Conflicts ...solved?