WE HAVE STATIC DATA
fixed weird merge
fixed weird merge