@postb99 are you planning to resolve the conflict?
@rajeshwarpatlolla if @postb99 resolves the conflict, are you open to merging this PR?
#300 seems like a pretty big issue and I am not the only person to run into it.

@shankari meanwhile I forked the project because it was hard to find the way to solve the merge conflict (the project owner was focused on its project for newer versions of ionic, i.e. ionic 2 and greater) it but don't use ionic anymore... You may have a look at my fork: https://github.com/OSAMES/ionic-datepicker (I realize that I was using only bower at this time, not npm, what a way back).

I abandon the PR :-)