resolved forgotten conflict