Have to specify the filename on git checkin.. Interesting
Read more about handling merge problems