Added omit
Added merge