merge and forget

I'm gonna work on master from now.