added parallax
fixed conflict