Version for testing immediately before pulling new updates.
Fixes merge conflicts.