Rewrite one test part
remote file
Split the tests(initial process from merge conflicts test)
Add new merge conflicts tests: AA, UU and AU
Merge branch 'master' of github.com:PressLabs/gitium