As per comment 3, the branch you need to use is the one on the ubuntu- docs project and not on the ubuntu project. It looks like you are proposing the merge on the ubuntu project, which may be why you have the conflicts.
No need to touch the changelog, we will group together various fixes in a single upload later in the cycle. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/804855 Title: Typo string 913 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/gnome-user-docs/+bug/804855/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
