Minor Changes

Death to conflicts