Ya got some merge conflicts in yer code.