fixed global/local conflicts