Update for new mycroft template
resolve conflicts