parallax quickfix
merge conf parallax fix