Bug while creating Pull Request

[aryaparasharmrt]

@aryaparasharmrt there is the merge conflict when a pull request by "arya" branch. Take refrence from provided link https://github.com/aryaparasharmrt/Java_Project/pull/6.
Have a look and resolve it.

Thankyou