test ammend
aaaa
add test1 by amend
modify test1
test conflict
resolve conflict
Merge branch 'master' of https://github.com/kisay/laravel