added jquery effect
solved merged conflicts