Implement completing of items
fix merge conflicts