managed to merge with cody