Resolve merge
Remove compiled stylesheet from version control
Ignore compiled stylesheet