Merged both branches together manually.