a simple comment on master
new file and pom modified to cause merging problem on master
first commit on testing branch
another commit on testing branch
new file and pom modified to cause merging problem