manual merge, close #1