Reverting unwanted merge