manual merging of Daniel's work on his repo