merging ACT with master