Fixes merge bug