Conflicts fix