used git add src/gittraining/Gittraining.java
trying to merge Gittraining.java 1