add file change events….
merge conflicts