commmit with score sheet
solved conflicts