setting conditionals for empty inputs and nil values
fix merge conflicts