Fixes merge error