[BUGFIX] minor changes to avoid conflicts