Corrected small mistakes n template such as a missing grace_chirp and some number duplication in sensors. Merge worked fine