manual merge with Pedram's versioned but conflicted project