Fix error in manual merge