Fixes merge errors