commit after resolving conflicts
authorHamed <hamed.gorjiara@gmail.com>
Thu, 15 Jun 2017 19:56:05 +0000 (12:56 -0700)
committerHamed <hamed.gorjiara@gmail.com>
Thu, 15 Jun 2017 19:56:05 +0000 (12:56 -0700)

Trivial merge