Removed conflict tag