fixed resolves conflict