merged again because we are all working on the same branch, which is probably a bad idea