removed conflicting mapping, sort it later