Add executables to build
Fix merge