Implement wiser timezone
Fix conflicts