conflicts qgit

