Connect parallax done.
Merge conflict.