try
new line
another line
fix conflict
Merge branch 'master' of https://github.com/tjian123/mycode