countdown view controller
resolved merge conflict