Merge mistake reverted