Fixes merge changes, again