Fixes merge issues