Fix merge from upstream/master conflicts