Fix conflicts.
Fix comments.
Add user another as support team