Add main/dependency-reduced-pom.xml to .gitignore which generated file from maven shade.
Fix merge conflict.
Merge pull request #221 from hsaputra/add_dependency_reduced_pom_xml_togitignore

Add main/dependency-reduced-pom.xml file to .gitignore