Should be mergeable if you pull master and fix the conflict on this line.