remove user specific file, please add them to your .git/info/exclude file
canvas os as a gem
Merge branch 'feature/ifa' of github.com:HighEd-Solutions/canvas-lms into feature/ifa
Merge branch 'feature/canvas_os_as_gem' into feature/ifa