comment and test git conflict from cmd line
merge