make conflict3