Basic merging works, but comments are not transferred.