Fix falure in manual merge