Should I upgrade to the HTC One M9 or the Samsung Galaxy S6?

[AC Question]

Hi, iv currently got a Samsung S4 so an upgrade to either of these phones will be a big difference to me. Iv heard from most people that the S6 is much better than the M9 but im still not sure. Iv heard the M9 updates have improved things slightly. Which should I buy?