really got rid of the warnings
merge