+ Line endings & git attributes
Fixed push.default conflict