Fixed conflicts with fragments