Merge branch 'master' of /home/kate/au with conflicts.
Merge remote-tracking branch 'origin/master'