magnific popup
test merge
Updates