merge changes to generic