Snap type choices
Fix merge conflict