Create Caskfile
Resolve merge conflict