clenaup and fix merge :-)