Rename for case sensitivity
Now rename it back, and voila!
Merge branch 'development'
trying again
Merge branch 'development'
and back again
Merge branch 'development'