Sorry. This is the first time I use git to resolve conflicts. I removed it accidentally.