Reverting merge