modified autobuild templates
resolved merge conflicts