I'd say: merge it now, I will change it to something better later.