Logic fails
Fixed all the things. Merge works now