We should definitely wait until this kind of stuff is resolved before merging.