File icons show different file types
Fixed merge conflicts