edit the A1 document
fix the merge conflict for CSS