fixin conflicts