CHANGIN FOR MAKE CONFLICT (DEV)