merging
Finished up contradictions. I need to test them though.