Adding canvas configuration to the repo
Resolved config files conflicts