working on merging.
fixed merge conflict.
worked on kalkombat.
fixed merge conflicts.