Updating Simulator after merging conflict error.