Colombia government and FARC rebels reach new peace deal