[Upg] changelogs
Merge branch '1.1' of github.com:MrJuliuss/syntara into 1.1
[Upg] resolve conflict
Merge branch '1.2' of github.com:MrJuliuss/syntara into 1.2