get rid of ff error messages
fix merge issue