lame-o manual merge