Removed conflict errors