change all fragments to activities
fix conflicts