It's finished
resolved merge conflicts
Final version