result rendering bugs fixed
display bug fixed
conflicts resolved
printing error resolved