Resolved merge issues.

Related to issue karlitrotski/CodingSpectator/#32.
Pair programming with @cinai.