This merge should work out (I've already resolved the merge conflicts)

Comment here