merge changes for contribute fixed