Merge Changes that got reverted