retrospective commit
merge sorted out