Normalize line endings
resolve merge conflicts