merged synergy into develop