Removed merge conflict relic