merge loic