Remove snap from project
Fix merge issue on team activity