minor
conflict resolves
logic