Merge fault fixed