Conflict solved + improvements