Hi we edited this area at the same time, I made some fixes since there were a few conflicts after closing my own changeset 139161590. Just cleaned up duplicates after that, if you're happy with how it is now then don't worry