merge mondeath.cpp guilt malus fix