conflicts fix