Fix merge conflict

Looks like there was a problem with the merge conflict going from master to develop