Fixed other issues conflict caused