Fixes merge conflict, uses force