reporitory init as maven project
merge conflicts resolved