added snap button
merge problem issue