traps.c :"Fix Merge Confilcts"