Finished passing tests... After a long day. GJ team
Fixed merge conflicts