Adding local files on Kairi
Fixed conflict in ignore file