correct conflicts