Revert "Conflict Merge"

This reverts commit a2417f21aec221b0cb968490ffa4223b066d7e1a.
Recovered broken v12 file