Fixes merge bugs