merge changes for loctogo