revert unwanted merge left overs