Is this still an issue? It's the only thing preventing me from merging.