I think merge failed so fixed it!