fixing errors in franck merge