FIXED: Wrong import on merge fixed