commit
nnnnnn
merge - solved problems