parallax beta markup done
merging