schema conflicts
Merge branch '6-0-stable' of github.com:ArthurHoaro/Public-GitLab into 6-0-stable