[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg"
 nickname="Tim"
 subject="comment 6"
 date="2013-11-14T14:58:10Z"
 content="""
Ah indeed, tried it again and it's indeed fixed. Tried some other things as well, and conflict resolution ended up doing just fine.
"""]]