Fix last Conflict