Working on build system.
Fixed merge conflict.