Mac OS X ignores
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
merge conflict
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan
Merge branch 'master' of github.com:ikasanEIP/ikasan