All changes completed, ready to merge