Resolve merge conflicts

src/dehacked.c

src/hardware/hw_light.c

src/info.c

src/info.h

src/p_enemy.c

src/p_mobj.c

src/sounds.c

src/sounds.h