Some conflict resolves and background