GitHub repository: vishaladdala/resolvingmergeconflicts
Description: practicing resolving merge conflicts using spring sts (egit)