fixed merge()
Merge branch '009p7' of https://github.com/Rhinostone/geena into 009p7