fixing parallax styling and single conditional
fixing parallax styling and single conditional
fixing merge error
fixing merge