last todo rejected
resolved merge issies