+ comments & fix conflicts