Removed conflict shit