Workaround merge conflict

See above