intermediate checkin before switching to git flow