fixed merge errors, corrected indent, moved consoleClear() to system.c